Refactored a bit.
  - No longer using port factory - added little value
  - Removed extraneous import and fixed java doc