A lot of fixes

Redundant `self` detected.