fixed double scrolling of cell issue, code cleanup