refactor and bubble