Small refactor to prepare for pairing