Iss #137 - Remove magic numbers, split out large lambdas for code smell

Resolves #137 (closed)

Merge request reports