Code cosmetics: make dictionary more readable