Remove a magic number
Make the code less costly
Merge pull request #17 from mortice/refactoring-harder

Remove a magic number