Fixed doc formatting
No underscore in argument names
Reformatting / reorganization