Removing unneeded conditional and fixing some typos in comments.