refactors after merging in jp's qr br