Reorganise performant code section
Name figure chunks