Constant scroll offset + code cleanup