Some formatting changes
Final touches