Improved Comments
Some renaming