Remove quotes where not needed