Cleaned up Listing Controller