A few comment cleanups