Clean up format & story