cleaned up code & added laserpointer