Misc. formatting adjustments