WordPress coding standards adhered

Throughout the package the WordPress coding standards were not implemented very consistently. These two commits fix that.