Cleanup, Formatting, New Stuff