Cleaning some code, need to divide 2d scrolling and 2d mapping