Code Cleanup to closer match WordPress standards.