clean up a bit, move the click event over too