Refactored classes and  removed the Constants class