Style tweaks and typo fix