Fix and capitalize