Code clean up
WIP - @filter syntax
FIXED: Inline syntax checks out