refactor and use container instead of static