minor cleanup etc