Updated and cleaned a lot of files

I'm really ont sure, these changes were from a while back.