Minor cleanup and removing extra readme file.

Tweaks comments to use same style across files, fixed some indenting issues, etc.
Cleanup tweaks in variables.
Merge pull request #1 from fleeting/master

Minor cleanup.