Fix linting
Improve versal mixin