Update assembly plugin

And formatting cleanup.