Style fixes, updated dependencies.