(More) Lint friendly version