Optimalisations

Redundant `self` detected.