Clean Up

Quick cleanup, some identation, some unnecessary type sigs removed for
readability. For me anyway, it wasn't helping.

This version is broken for `extern` fns.