Refactor/release tag and return value