fixed comments & naming