cleanin up minor stuff