Modernize code, fix noads zone

Change-Id: I2d828ac2c18372a4255e55e4ce77c59a115b98d4