better naming, resolved some obsolete selfs