some useless modification and a TODO inclusion