Added more formatting throughout