Reorganizing the code + sun set puts lights on