Cleaned up the code prior to the pull request.