Cleaned the code.  Refs #7476.