Fragment refactor