Refactor rescues a bit