flow improvement and cleaning up after ourselves, improved baseview