refactor to make cases look the same