Tidied up annotations