began to refactor linear factors