use 'self' in case someone subclasses these
note
clearer code style
version bump