Do some DRY-ification