Refactoring
Fix port conversion