Bugfix HIT, Refactoring