Large clean up and formatter module added
Small stylistic corrections