Refactor update

@lukecampbell @brianmckenna @ednad 

There!