Fix last model dependencies
Fix some code style conventions