Fixed style and minor issues. refs #472