Refactor Manage Products