-- work in progress --
  * comments clean up