Style tidy up
v0.6.8