Made NightVision follow coding guidelines