Cleaned the code. Refs #9095.