Added better printing styles and ran tidy on source files.