Found more "this" qualifiers to get rid of