refactoring to the latest & the greatest
refactoring to the latest & the greatest