Cleaning up and changing interaction code