Some old style refactoring