some minor cleanup issues