Dimmer working. Refine a bit, clean everything up