some missed refactoring