[refactoring] Cleaning up.