cleanup quotes and simplify