fixed null exception bug, renamed class