Cleaned codes. Refs #8291.