Style changes (see #32)