refactoring .. no more hero