added logging, renamed class