Much cleaner; eliminating some string-to-object steps