Add grunt.event support + cleanup