Comments and minor cleanups