Now with a few more comments, fewer linting issues and beter gulp