Renamed and improved comments. Better?