update comment and tiny cleanup