took some logic out of click binding
Renamed some variables, removed all extraneous interval code