Code cleanup
Cleanup and improve xenon light switch behaviour