Cleaned the code.  Refs #7336.