#27: Some code reformatting and preparation for Twitter based unit test.