Refactored classes. Eliminated  parameter and associated code.