Additional code normalization 2.