The code cleaning/refactoring...it never ends.