@ceckert2000 i see refactoring opportunities </…

@ceckert2000 i see refactoring opportunities </duck>