Make character replacement a bit more systematic & uniform throughout