collect into variables
remove cruft