some blind refactoring