I thought I cleaned those apostrophes up already.

Um, some refactoring too.