i dont have a night light and we turn the light off...
i also make sure the light outside his room is off so that when i go out (ie open the door to leave) the light doesnt wake him up or get hiom away from his drowiness... (ie if the light streams in he tends to check i am still there even if he is just about to go to sleep)
we close his door (he can open it if he is trying to get out, but doesnt)
I have a monitor in there so i can hear everything with the door shut

for us having the bath as part of the winding down routine works well - he doesget hyper in there but we have always done it thatw ay so he knows what is coming next...