Code cleanup; attempt to reflect WordPress coding standards.