Made changes of Chris and Brian's feedback