Added formatting option logic