navigator: comment only changes / code style fixes