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