Don't use quotes unnecessarily + clean-up