Added Interactable Area

also cleaned up some code