more stupid refactoring ideas