Refactoring port