Finished refactoring for use in Seller Portal.