finished refactoring

code refactoring - more cleanup

(0) -2 +2 +10 +30 tip

mercurial