more todo
use number in numeric values, shorten redundant variable name