Code CleanUp for pull request