Fixed Code Standards issues.