refactoring to the latest & the greatest