Tidy and fix indentation

Let's see if this fares any better ...