refactoring

with danny