fixed: small errors related to refactor