Simplified structure, better visualization
Refactoring, addition and multiplication only