add whitelist to clean_stacks
clean up the specs a little bit - common code in before and some style and breaking out vars etc
a little more shuffling