Change style and small typo fixes