chore(cleanup): Refactoring the Listing object and some clode cleanup