update: refactored helper lib utils