c24 Clean and width fix