Refactoring AWS to helper