Cleaned up stuff
Cleaned up stuff