Clean up

Cleaned up some code