fix prev commit again + removed unneeded class member names prefixes