Code Conventions Cleanup

I cleaned up the conventions. I only made minor changes to the code. I
removed all of the error / warning ignoring. I did not add anything.