Scroll refactor