chore: common helper methods minor refactor