Some cleanup.

Also trying to get my repo in sync with github's