Cleanup
Merge pull request #4 from yakubbaev/master

Cleaner code by using constants instead of direct values