Misc changes before formatting the repository differently
Change source format, addresses #1