Stop dart from complaining
Minor tidy up + string chunk keys