Remove unnecessary encapsulation
Cleanup and refactoring