Cleaned up the codebase for a pull request.