Improving style, refs #30