Made more standards compliant