little more cleanup
unwound even further
cleaner