Minor code review changes - fixing typos etc.