add todo
use constant
improve comments