Stuff
Code clean up and output prettitizing