Fixed typo and other cleanup