We don't want to use typeof and itertype anymore. It's not good practice. Part 1 of code refactoring still a lot of errors.