Refactoring: replace var with interface name