Cleanin up a bit