Refactor Highway model