Add dependencies, fix formatting