Actually use port value; fix tab order; cleanup