Tidied up coments