Made changes based off Ryan's feedback