Refactor out amazon keys to proper env calls