tidy up of indenting