Review and refactor