Cleaned up how we switch out app keys/ids based on environment