Add unit support to do
Clean up result output