clean up and organized gulpfile