Fixed typo, and refactored something or other