Cleaned up stuff

Cleaned up more stuff