Cleaned formatting up a bit