4 - Refactoring

Complete and Continue