Code decoration refactoring performed.