Corrected spelling error, and some clean up