load more refactor