Style improvements

Done along with @mollymcleod!