some slight cleanup + merged a change