Some refactoring, more WP coding standards.