Added some comments / removed old code