Minor refactor, ready for binned site quality