Refactored 
5 files changed