fpull: Use rebase
fpull: Refactor code