Fixed a typo and did some organizing.