Style & construction verification

Style & construction verification