cleaned up format