minor cleanup while at it