Style and comment cleanups