Home list product - refactoring code