Issue #11 remove $stash
Issue #9 arranged code views