Refactoring

I did a little bit of refactoring (LightController and GuiHelper
classes)