refine code for getting lots of warnings

add a TODO