Cleanup and finishing mixins
Updating submodule