Organzied constants in classes and refactored code. (#28)
Merge pull request #29 from tiriplicamihai/f/#28-organize-contsants-branch

Organzied constants in classes and refactored code. (#28)