Add port and user parameters, cleanup a little