Code clean and scroll shot but fix