Make formatting more consistent and tidy-up.