General reformat of codebase.