refactoring, preparing for wheel creation