Here are some changes I made