Some changes to the code format, this should make future diffs cleaner