Clean up last commit to better conform to standards.