Tidied changes