Codestyle fixes
Dependency management