Some code clean up and moving some duplicated code to .doAction