Minor code reformat/refactor.