refactor actions, try keeping them short so indenting does not confuse us