Type.getType refactoring
Refactored method names