I made it this way because in my opinion it was easier to read, but I'll make the change