(cleanup) Clean code for pull request