Tidy up code
Fix --args to Moose's new()