Remove self

Removed self to simplify the code