tidied formatting