Extended the new code style to the Contiguous C1 motion