Refactored to remove AWSInitialization class