Updated style

Probably squash these commits and rebase later, as not really conducive
to actual work carried out