Cleanup, added some docs, ang go fmt'ed