remove Block and divide while and for