remove unneed def property and add clearer comments