Added more filters and cleaned up the output