[aws] tweaks
[refactor] moved init to builder