semantic consistency and format fix