minor cleanup after first edit

SDW+BSW need to review TODO items