Style adjustments. Closes #7