These are some changes I made

Completely optional