A little refactor. A new branch is needed to create a pull request. https://github.com/Sweetchuck/mindscreen-yarnlock/tree/2.x