Cleaned up format