ECOM-369 Updated after code review