Small fix and reformattings