fix for double finish, some code review feedback cleanup