More changes to try and fix formatting of Swift