Import fix
Code style & imports fix
Style fixesin mixins.base
Imports
Base mixins (coding style)