Created cleaner directive, factory and filter syntax