refactoring assets controller