simple refactoring to reduce number of files