Cleaned up

Removed the uglyness  and made it all pretty