Fixed the output format (war)
Cleanup, working example