directive refactor, removed underscore and toArray modules