Addressed Mike's feedback