Cleaned the codes. Refs #8685.