= #1 slight cleanup