Tidied up tabs and spacing