Tightening ups some code and adding filtering of useless records