Code Cleanup

Cleaned up some code!