Changed comments & changed documentation