Changes:

Some minor changes after a round of feedback on the code.