Listing spacing tweaks and cleanup