remove leftover onclick
use jQuery on() instead of live()

plus some cleanup