basic refactoring, no adding of functionality