Tidied line spacings, removed unecessary 'super' and 'this', refactored atom header creation and removed old print statements