Cleaned up some coding standards.