updated 2 suggestions Adam made