a little bit refactoring :)