Refactored using Lint.