refactored static data