Tidied up some code and updating some names and removing parts of
overridden stubs