Refactor reviews assignment; user reviews broken