reorganized items and removed extra lamps