Some nifty formatting changes