Fixed multi-scroll, cleaned code