Added some comments, cleaned up old code

Removed a few old commented chunks of code
Added more comments
Fixed some tabbing and spacing errors