Some cleanup, no change.
Merge pull request #10 from kgashok/remote

Some cleanup, no change.