Refactor code, rebased?