Code cleanup

Removing comments, doing some commenting, etc.