Minor spacing, consistency and typo fixes