@scottgal Have any tips for refactoring?