obesesive comment cleanups