Add explicit self var to class methods