Refactor update

@brianmckenna , @ednad  and I went over this, and it looks good.

Please review when you have a sec