minor fixes and unneeded names