Added some comments, cleaned some code
Cleaned up some code