method renaming, bug fixes, refactoring from code review