Tidied formatting