Minor spacing normalisation
Initial implementation of #29