Remove debugcode and change some comments