I would split things up to make it a little more clear what happens when.