Refactored to switch statements, consistent quotes