Refactored classes
Removed lang