`fix` some clean code