Started making some formatting changes