Attempt cleanup of PHP vs HTML