Clean up code, remove evil Maybes and not-quite-filters