some tidy up
more tidyup
Merge branch 'tweaks' of github.com:corespring/anvil into tweaks