Some cosmetic fixes

Just a small follow up to 93fe1b4c787, which appeared to have some inconsistencies in how arrays of objects were indented and single line if statements.