Style fixes and deploy.targets format tweaks