Changes to match guidelines