Cleanup - comments and keys

Added end-of-function comments, list of keys for classes, and changed some white space in a few files.