cleaned up some comments and code
Revert "cleaned up some comments and code"

This reverts commit 99c427c97dfa112be75e359c89bc178e1f65ccbb.