Minor cleanup and removing extra readme file.

Tweaks comments to use same style across files, fixed some indenting issues, etc.