more refactoring/cleaning up