style and comment fixes