Gulp Refactor

Just a little cleanup here and there. Details in commit messages.