Do some indent cleanup