Some WordPress Coding Standards fixes