Cleanup, new initialization function, randomise group level