a little refactoring
account events refactoring