Iso style cleanup

style cleanup - removed fieldsets, converted tabs to spaces, aligned hash rockets, adjusted formatting, etc