started ProductActivity refactoring