* changes to add informer for environment * remove unnecessary code * code refactor * code review changes