diff: refactored.