Code styling and a gulpfile fix