refactoring

as discussed :)