first refactoring commit