Some automated reformating.