tidied formatting and added consistency to spaces