Adding comment & deletingunnecessary method