Structural Refactoring
Code Reuse Improvements.