Merge pull request #11 from cgay/simplify

Simplify
Remove obsolete --profile option.
Reorganize code.  NO FUNCTIONAL CHANGES.