Cleaning up and fixed a typo