Refactored towards better convention for linting.