Issue #109

Replacing magic numbers