some slight cleanup
some slight cleanup + merged a change