Cleaned up some code

Ignore the unchanged files plz.