use a token instead of u/p and clean up double quoted strings