Fix formatting of file; prepare new file for JS Part 2