Quick refactor.