Refactoring: Removing types where possible