refactor to make releases easier