Cleaned the codes.  Refs #7704.