Making some formatting changes, hopefully it looks better afterwards