refactoring

like the title says