ref #1193 -- some cleanup to PR
ref #1193 -- some cleanup to PR

josephbergdoll/timber,xavivars/timber,jarednova/timber,gchtr/timber,xavivars/timber,timber/timber,jarednova/timber,gchtr/timber,jarednova/timber,xavivars/timber,timber/timber,josephbergdoll/timber,gchtr/timber,josephbergdoll/timber