Cleaned the code. Refs #8518.