Simplify code now data is fixed