refactoring session #1