refactoring to corvette