Refs #1969: Code refactoring and reformatting only