refactoring

Kate and Mike