Refactoring of the rounds