Cleaned up C coding styles