Cleaned up stuff

Cleaned up variables