Made some readability updates

As before, read the comments in the code