Cleanup on dice rolling

Also added a bit more spacing between the init marker and the phase
token