finished cleanin and commenting. 2