Refactoring: Use explicit typing