issue #22 #close
slight cleanup