Finished all feedback from review 1