slight assets module refactoring