Cleanup; very basic JSON formatting of files