fix: some changes in the code