Change: cleanup on actions and starting/ending game