Refs #1101 - More cosmetics