Removing magic constants

...for increased readability of code.
Merge pull request #12 from JensRantil/remove-magic-constant

Removing magic constants