Minor style changes and IIN clean-up.