More tiny refactoring type changes