Cleanups
More cleanups and comments