Quick refactor to share a method