do tiny refactoring