small initial refactoring