Lasers are now entities
Code cleanup