changes from act and code review