aesthetically motivated dictionary changes