Tidying up spacing in commodity code