Formatting and bug fix for CC states