Updated to standard Python C coding style, and fixed a few error

checking nits.