Cleaning up names, comments, licensing.