Style, typo and iit fixes