Tidy up blank lines & indentation