Refactored w/ switch statements, quote consistency