direct refactored to pass lint.