Refactored list-ports