Some refactoring in assets