* Code cleanup for PBP
  --help now prints full help