Refactoring Example done