Refactoring Typing + Hack