-- work in progress --
  * cleaned up more the methods.