Refactoring: Reindented some lines, broke up some long lines.