Refactoring session with Arlandis