Refs #1101 - Cosmetics