Commit some cleanup. Probably should have started completely from scratch,
but whatever; a slow evolution is better than nothing