Clean up

Code clean up, light control aplication