Cleaned up the clicking code for bubbles.