Cleaned up a few lines of code to meet WP standards