cleanups in create()
Merge branch 'api-filters' of git://github.com/oliwierptak/Everon into api-filters
style & cleanups
filter cleanups