do a little bit refactor