nicer flatten
3 files changed