Cleaned up some more formatting