little overview refactoring