Manually merging cosmetic changes from hollie/master so merge will no conflict