Indentation tidy up