Refactoring session 21.2.2013