added users, reviews and refactored