Cleaned up code some more

booyah