final minor cleanup