Made ReviewController much better