fix: clean; refactoring