Refs #442. Code cleanup based on review notes.