Tweaks and formatting changes