feat: cleanup(it still very dirty... )