refactoring, duh.
refactoring Duh.