File cleanup.  Use Python-standard 4-space indentation.  Make method/function names consistent within modules, due to Google's protobuf nonstandard styles.