Tidied up some logic in the Cursor