Performed some housekeeping to prepare for submission to pypl, also taken out filter