Clean up code for pull request.