Consistent quotes
Replaced conditionals with polymorphism