Cleanup split_port, with more validation