style cleanup - removed fieldsets, etc

Issue #1491
converted tabs to spaces, aligned hash rockets, adjusted formatting

Issue #1491
Merge pull request #301 from epwinchell/iso_style_cleanup

Iso style cleanup