refactoring of method names and optimize products/all