Clean, fix typos
Update get class name