Naming / comment improvement.