keep output in is own describe block
Merge branch 'cleanup'