Cleaned the code. Refs #8427.