Fix style
Implement NOCHG detection