Refactoring
Change types