Partial refactor and integration on checkout process