7-9 koans done + refactoring