improve code style
update TODO
something