Indentation tidyup