Cleanup args and policy style