I have hard time to understand what you mean (begining at if we could refactor ...) can you give examples ?