General cleaning and corrections, added missing style-5 for npn-thru