Improving data filtering printing
white space clean-up