Take further measures to make diff simpler
Clarified some var and made it easy to customize