removed events::*
updated code style