More readavle listing
Cleaning, added delete function, better filtering and space removal.