add review path
use new relations
cleanup code