Refactor and Clean for code review