Fixed typo, clean-up, formatting