code cleaning and removed commented block of code