Reshuffle constructor, resolve -worder warnings