Cleaned up some of the code
Cleaned up some of the code