Further style corrections
A version to be submitted to JSS