tyny refactoring