Remove unnecessary 'self' keywords