Clean up the Nighttime class a bit