This is an excellent cleanup and following the DRY principle. Good work.