-some minor cleanup