Fixed but in usage.
Removed unnecessary references to 'self'.