renamed methods, clean up
update unitTests