Refactor final code review