Mild refactoring