cleaned up a bunch of old, unnecessary commenting