Lets get make the code a little more standards compliant.