Clean up comments and func names.