asset library helpers code refactoring