some minor cleanup