One f**k of a re-factoring. Now there is foundation  for comet