Refactoring files (private accessors, renaming)