More refactoring and assets.