Variable consistency
Better comments