minor code move about