Modulization finished.  Duplicated code gone.