Cleaned everything up so it works with gulp.