Made code more WordPress standards compliant