Some coding standard and typo fixes