Last sentence refactoring