Improved filtering for deletion
minor formatting