Refactoring frontend

Redundant `self` detected.