- tiny refactoring