Cleaned up more stuff
Still cleaning up...