class refactoring/encapsulation