Cleaning up mostly

I commit often.