Made changes based on Caridy's feedback.