Working on cleaning up Listing