Fixed typo, cleaned up more