Refactoring

needs it