slight rest action refactor