Review and refactoring