Internal refactor to better adhere to Gulp guidelines