Code Cleanup to me more standard C3