Moved some lines around, nothing special on this commit.