refactor and moved rating in with reviews