added quote, optimized header and config