small refactory that also fix some issues with weird from addresses