Refactorings in preparation of implementing gulp