slight cleanup 2