Update project dependencies
Cleanup stupid indentation/doall
Merge branch 'feature/cleanup'