Reodering and typo fixes