Refactor to try to prevent double-commits