Static asset refactor