Implemented light/lamp better, defactoring.