Comments has been added and removed some junk codecode