Cleanup and additional comments based on Sue's review.
refs #450