white-space and comment nits