Code normalization and method renaming