Refactor usage of static resources