Formatting and Language Tweaks