Standardise whitespace using BF rules.
Remove dead code, update comment.
Merge pull request #1 from bpindelski/pr-1252

Minor fixes.