implemented decision on classes review