Cleaning up code for wordrpess theme standards