little structure refactoring