tidy up to reuse extension method