Fix and style