Use builtin Nat & Fin
Cleanup, use more stdlib