Cleaning up index based on WP code standards