Add commends and reorganize code.  Refactor run.