fix warning and tiny cleanup