fix(libs): refactor a bit