Hall model refactoring