BF: clearer naming and notes