Code cleanups, comments