Updated Comments, removed unused variables.