fixed quotes, moved to assoc array fetch

moved to assoc array to improve code readability