general cleanup + much faster
Merge pull request #116 from dotcloud/more_filters_cleanup

general cleanup + much faster