Cleaned up some setup formatting.