Refactored classes to use helpers