Style and comments cleanup of previous commits