Kind refactor based on HVM - View it on GitHub