Code cleanup and update for WP 4.0

git-svn-id: https://plugins.svn.wordpress.org/pageview/trunk@983496 b8457f37-d9ea-0310-8a92-e5e31aec5664