fixed remove class and for loop