Cleaned up some code
Cleaned up some code