Clean - Refactor - Comment - Some Code Review