Comments and cleanup

Comments and cleanup