A little editing here and there