Tidy up eligibility styles and scripting