Simplify code
Use range data for sample code