Cleaned the code.  Refs #7847.