removed some commetns