Fix indentation and unused variable

I sometimes run my program with warnings on, and this program generates some warnings when I do that.

I've fixed the simpler problems involving code alignment, and an unused variable. There's some that are unresolved by this pull request, unfortunately.