A little bit of realignment of the code