Final refactoring session / more specs