Refactored assets