Minor refactoring, improved encapsulation