minor cleanup and comment