Fixing punctuation and removing defaults