Removed and improved some comments