Some clean up, get rid of redunant code and also move some event defines to the designer