Update to argus 0.4.0 and a little formatting cleanup