refactored actions
Merge branch 'cat' of https://github.com/mindpin/js-warrior into cat