Merge pull request #16 from mortice/refactoring

Improve clarity
Remove a magic number
Make the code less costly